From 8eb4861753664acd1681e829ec18258c4b9535fe Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 31 Aug 2005 14:53:43 +0000 Subject: [PATCH] Fix non-SMP build, broken by the previous changeset. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h | 5 +++++ linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h index 92af14b39c..3aa047dc9d 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h @@ -562,8 +562,13 @@ do { \ #define local_irq_enable() __sti() /* Don't use smp_processor_id: this is called in debug versions of that fn. */ +#ifdef CONFIG_SMP #define irqs_disabled() \ HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask +#else +#define irqs_disabled() \ + HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_mask +#endif /* * disable hlt during certain critical i/o operations diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h index 3fc3c550c3..c38dcb829f 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h @@ -388,8 +388,13 @@ void cpu_idle_wait(void); #define local_irq_enable() __sti() /* Don't use smp_processor_id: this is called in debug versions of that fn. */ +#ifdef CONFIG_SMP #define irqs_disabled() \ HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask +#else +#define irqs_disabled() \ + HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_mask +#endif /* * disable hlt during certain critical i/o operations -- 2.30.2